core: Ensure we clean up leftover directories during merge

(Not sure why this regressed)

diff --git a/src/libotutil/ot-gio-utils.c b/src/libotutil/ot-gio-utils.c
index ed730e773f43690addb02d74a36e0e54f1400792..cff99445ac1a4cdf761c1fc76c802c47676fb61b 100644 (file)
--- a/src/libotutil/ot-gio-utils.c
+++ b/src/libotutil/ot-gio-utils.c
@@ -276,6 +276,8 @@ ot_gfile_merge_dirs (GFile    *destination,
   else
     goto out;
 
+  (void) rmdir (ot_gfile_get_path_cached (src));
+
   ret = TRUE;
  out:
   g_clear_object (&src_fileinfo);